port 5b4819e to release #159209
port 5b4819e to release #159209
Conversation
|
@llvm/pr-subscribers-clang Author: David Blaikie (dwblaikie) ChangesApplies the fix on top of the backport made in #156664 Full diff: https://github.com/llvm/llvm-project/pull/159209.diff 1 Files Affected:
diff --git a/clang/test/CodeGenCXX/debug-info-structured-binding.cpp b/clang/test/CodeGenCXX/debug-info-structured-binding.cpp
index 4a4a4d8bdfaad..8032ce85c9e25 100644
--- a/clang/test/CodeGenCXX/debug-info-structured-binding.cpp
+++ b/clang/test/CodeGenCXX/debug-info-structured-binding.cpp
@@ -10,7 +10,7 @@
// CHECK: getelementptr inbounds nuw %struct.A, ptr {{.*}}, i32 0, i32 1, !dbg ![[Y1_DEBUG_LOC:[0-9]+]]
// CHECK: getelementptr inbounds nuw %struct.A, ptr {{.*}}, i32 0, i32 1, !dbg ![[Y2_DEBUG_LOC:[0-9]+]]
// CHECK: load ptr, ptr %z2, {{.*}}!dbg ![[Z2_DEBUG_LOC:[0-9]+]]
-// CHECK: getelementptr inbounds [2 x i32], ptr {{.*}}, i64 0, i64 1, !dbg ![[A2_DEBUG_LOC:[0-9]+]]
+// CHECK: getelementptr inbounds [2 x i32], ptr {{.*}}, i{{64|32}} 0, i{{64|32}} 1, !dbg ![[A2_DEBUG_LOC:[0-9]+]]
// CHECK: getelementptr inbounds nuw { i32, i32 }, ptr {{.*}}, i32 0, i32 1, !dbg ![[C2_DEBUG_LOC:[0-9]+]]
// CHECK: extractelement <2 x i32> {{.*}}, i32 1, !dbg ![[V2_DEBUG_LOC:[0-9]+]]
// CHECK: ![[VAR_0]] = !DILocalVariable(name: "a"
|
|
Are the test failures legitimate? |
sync and rerun seems to have cleared them up |
github-project-automation
bot
moved this from Needs Test Fix
to Needs Merge
in LLVM Release Status
dyung
force-pushed
the
port_5b4819e_to_release
branch
from
31b750f to
4e9d1b6
Compare
|
Hi @dwblaikie, before I merge your change into the release branch, can you confirm that the premerge failures in libcxx were not caused by your change here? |
So far as I can tell, yeah, they seem unrelated. @ldionne - any idea what's going on with libcxx presubmit checks here? Failures like "Error: Failed to remove "/scratch/powerllvm/cpap8006/llvm-project/libcxx-ci" (unlinkat /scratch/powerllvm/cpap8006/llvm-project/libcxx-ci/.ci/all_requirements.txt: permission denied)" - https://buildkite.com/llvm-project/libcxx-ci/builds/83843 |
dyung
force-pushed
the
port_5b4819e_to_release
branch
from
4e9d1b6 to
9158b87
Compare
Fix for the port of 665e875 to release/21.x in PR156664
dyung
force-pushed
the
port_5b4819e_to_release
branch
from
9158b87 to
05b5090
Compare
github-project-automation
bot
moved this from Needs Merge
to Done
in LLVM Release Status
|
@dwblaikie (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR. |
Applies the fix on top of the backport made in #156664